Update packaging to use new so version

Note, the jump from 5 to 8 was done, because upstream actually sets the
version so-version to 8.

diff --git a/debian/control b/debian/control
index 4298b5ba1c0c88abd257a532d87b55f3770fcb55..bb37789b90f013f3b30904314110ab46ee1fcee7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: OFFIS DICOM toolkit command line utilities
  .
  Note: This version was compiled with libssl support.
 
-Package: libdcmtk5
+Package: libdcmtk8
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -66,7 +66,7 @@ Depends: libxml2-dev,
          libwrap0-dev, 
          libcharls-dev, 
          libtiff-dev, 
-         libdcmtk5 (= ${binary:Version}),
+         libdcmtk8 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: dcmtk-doc
 Conflicts: libdcmtk2-dev, libdcmtk4-dev, libinsighttoolkit4-dev (<< 4.9.0)
@@ -99,11 +99,11 @@ Description: OFFIS DICOM toolkit documentation
  This package contains the on-line documentation for the DCMTK libraries
  and utilities in HTML format.
 
-Package: libdcmtk5-dbg
+Package: libdcmtk8-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libdcmtk5 (= ${binary:Version}),
+Depends: libdcmtk8 (= ${binary:Version}),
          ${misc:Depends}
 Description: OFFIS DICOM toolkit library debugging symbols
  DCMTK includes a collection of libraries and applications for examining,
@@ -111,4 +111,4 @@ Description: OFFIS DICOM toolkit library debugging symbols
  sending and receiving images over a network connection, as well as
  demonstrative image storage and worklist servers.
  .
- This package contains the debugging symbols for libdcmtk5.
+ This package contains the debugging symbols for libdcmtk8.

diff --git a/debian/libdcmtk5.dirs b/debian/libdcmtk5.dirs
deleted file mode 100644 (file)
index 6845771..0000000
--- a/debian/libdcmtk5.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib

diff --git a/debian/libdcmtk5.install b/debian/libdcmtk5.install
deleted file mode 100644 (file)
index 542961f..0000000
--- a/debian/libdcmtk5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*.so.*
-usr/share/libdcmtk5/*.dic

diff --git a/debian/libdcmtk5.lintian-overrides b/debian/libdcmtk5.lintian-overrides
deleted file mode 100644 (file)
index 357598d..0000000
--- a/debian/libdcmtk5.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# There is more than one library in one package bundles which makes perfectly
-# sense in this application but does not enable naming the library package apropriately
-libdcmtk5: package-name-doesnt-match-sonames
-libdcmtk5: embedded-library
-libdcmtk5: no-symbols-control-file

diff --git a/debian/libdcmtk8.dirs b/debian/libdcmtk8.dirs
new file mode 100644 (file)
index 0000000..6845771
--- /dev/null
+++ b/debian/libdcmtk8.dirs
@@ -0,0 +1 @@
+usr/lib

diff --git a/debian/libdcmtk8.install b/debian/libdcmtk8.install
new file mode 100644 (file)
index 0000000..e29d7cb
--- /dev/null
+++ b/debian/libdcmtk8.install
@@ -0,0 +1,2 @@
+usr/lib/*.so.*
+usr/share/libdcmtk8/*.dic

diff --git a/debian/libdcmtk8.lintian-overrides b/debian/libdcmtk8.lintian-overrides
new file mode 100644 (file)
index 0000000..eba395f
--- /dev/null
+++ b/debian/libdcmtk8.lintian-overrides
@@ -0,0 +1,5 @@
+# There is more than one library in one package bundles which makes perfectly
+# sense in this application but does not enable naming the library package apropriately
+libdcmtk8: package-name-doesnt-match-sonames
+libdcmtk8: embedded-library
+libdcmtk8: no-symbols-control-file

diff --git a/debian/rules b/debian/rules
index c7c647b320034280966e27d470b520f134fd14bd..37466cdf1e0621027aae7647fa4f59260d404110 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_ICONV:BOOL=ON \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk5 \
+ -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk8 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF
 
 
@@ -77,7 +77,7 @@ override_dh_install-arch:
        rm ./debian/dcmtk/usr/bin/mkreport
 
 override_dh_strip:
-       dh_strip --dbg-package=libdcmtk5-dbg
+       dh_strip --dbg-package=libdcmtk8-dbg
 
 get-orig-source:
        uscan --force-download --verbose --rename